From: bors <bors@rust-lang.org>
Date: Sat, 26 Aug 2017 17:57:40 +0000 (+0000)
Subject: Auto merge of #4358 - Mark-Simulacrum:fix-cfg-cargo, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~7^2~3
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=7847f75bb6fc4fee6f511ca740bbe6872c08502b;p=cargo.git

Auto merge of #4358 - Mark-Simulacrum:fix-cfg-cargo, r=alexcrichton

Discover crate type information late if necessary.

Some crates aren't found during eager crate-type searching due to being behind `cfg(...)` flags. We still want to be able to handle these, though, so when necessary we now call rustc again to get crate-type information for these cfg-ed crates.

This is necessary for https://github.com/rust-lang/rust/pull/41991.

r? @alexcrichton
---

7847f75bb6fc4fee6f511ca740bbe6872c08502b